Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 26 Jun 2011 17:29:50 +0000 (10:29 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 26 Jun 2011 17:29:50 +0000 (10:29 -0700)
commit360cf66f87b27d7a260b7cc823663877537ce26c
tree46f8cdb2233c82e9be9ef41844f9a6c70d8b29b7
parent19f23648bff0e698c45c0fb2f15de4e038794cfe
parent6ed8dfc99a27bd9ed1b5ba3b6523f9c32253df67
Merge from trunk.